From: kfraser@localhost.localdomain <kfraser@localhost.localdomain>
Date: Wed, 14 Feb 2007 19:01:35 +0000 (+0000)
Subject: Merge with xenppc-unstable.hg
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15327^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=b3f09a8a4fe5c32f35379f3b4eadc5e2b1d4dfc6;p=xen.git

Merge with xenppc-unstable.hg
---

b3f09a8a4fe5c32f35379f3b4eadc5e2b1d4dfc6
diff --cc xen/common/libelf/libelf-loader.c
index 9c4491ebe4,e106a6f568..e0f8dba913
--- a/xen/common/libelf/libelf-loader.c
+++ b/xen/common/libelf/libelf-loader.c
@@@ -118,20 -118,18 +118,20 @@@ void elf_load_binary(struct elf_binary 
      char *dest;
  
      count = elf_uval(elf, elf->ehdr, e_phnum);
-     for (i = 0; i < count; i++)
+     for ( i = 0; i < count; i++ )
      {
- 	phdr = elf_phdr_by_index(elf, i);
- 	if (!elf_phdr_is_loadable(elf, phdr))
- 	    continue;
- 	paddr = elf_uval(elf, phdr, p_paddr);
- 	offset = elf_uval(elf, phdr, p_offset);
- 	filesz = elf_uval(elf, phdr, p_filesz);
- 	memsz = elf_uval(elf, phdr, p_memsz);
- 	dest = elf_get_ptr(elf, paddr);
- 	elf_msg(elf, "%s: phdr %" PRIu64 " at 0x%p -> 0x%p\n",
- 		__func__, i, dest, dest + filesz);
- 	memcpy(dest, elf->image + offset, filesz);
- 	memset(dest + filesz, 0, memsz - filesz);
+         phdr = elf_phdr_by_index(elf, i);
+         if ( !elf_phdr_is_loadable(elf, phdr) )
+             continue;
+         paddr = elf_uval(elf, phdr, p_paddr);
+         offset = elf_uval(elf, phdr, p_offset);
+         filesz = elf_uval(elf, phdr, p_filesz);
+         memsz = elf_uval(elf, phdr, p_memsz);
+         dest = elf_get_ptr(elf, paddr);
++        elf_msg(elf, "%s: phdr %" PRIu64 " at 0x%p -> 0x%p\n",
++                __func__, i, dest, dest + filesz);
+         memcpy(dest, elf->image + offset, filesz);
+         memset(dest + filesz, 0, memsz - filesz);
      }
  }